Autogenerated HTML docs for v1.7.12.2-421-g261b5
diff --git a/RelNotes/1.7.12.2.txt b/RelNotes/1.7.12.2.txt index 93c7b34..6925574 100644 --- a/RelNotes/1.7.12.2.txt +++ b/RelNotes/1.7.12.2.txt
@@ -4,6 +4,9 @@ Fixes since v1.7.12.1 --------------------- + * When "git am" is fed an input that has multiple "Content-type: ..." + header, it did not grok charset= attribute correctly. + * Even during a conflicted merge, "git blame $path" always meant to blame uncommitted changes to the "working tree" version; make it more useful by showing cleanly merged parts as coming from the other @@ -24,6 +27,11 @@ is not their language, mildly irritating others. Localization to the line has been disabled for now. + * "git log --all-match --grep=A --grep=B" ought to show commits that + mention both A and B, but when these three options are used with + --author or --committer, it showed commits that mention either A or + B (or both) instead. + * The subcommand to remove the definition of a remote in "git remote" was named "rm" even though all other subcommands were spelled out. Introduce "git remote remove" to remove confusion, and keep "rm" as
diff --git a/RelNotes/1.8.0.txt b/RelNotes/1.8.0.txt index a325a98..e183df6 100644 --- a/RelNotes/1.8.0.txt +++ b/RelNotes/1.8.0.txt
@@ -68,6 +68,9 @@ * The "-Xours" backend option to "git merge -s recursive" now takes effect even on binary files. + * "git rebase -i" learned the "--edit-todo" option to open an editor + to edit the insn sheet. + Foreign Interface @@ -129,89 +132,84 @@ maintenance track are contained in this release (see release notes to them for details). - * When "git am" is fed an input that has multiple "Content-type: ..." - header, it did not grok charset= attribute correctly. - (merge 176943b jc/maint-mailinfo-mime-attr later to maint). - - * "git blame MAKEFILE" run in a history that has "Makefile" but not - "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got - confused on a case insensitive filesystem and failed to do so. - (merge 9aeaab6 jc/maint-blame-no-such-path later to maint). - - * Even during a conflicted merge, "git blame $path" always meant to - blame uncommitted changes to the "working tree" version; make it - more useful by showing cleanly merged parts as coming from the other - branch that is being merged. - (merge 9aeaab6 jc/maint-blame-no-such-path later to maint). - - * Documentation talked about "first line of commit log" when it meant - the title of the commit. The description was clarified by defining - how the title is decided and rewording the casual mention of "first - line" to "title". - (merge 52ffe99 jw/doc-commit-title later to maint). - * The attribute system may be asked for a path that itself or its leading directories no longer exists in the working tree, and it is fine if we cannot open .gitattribute file in such a case. Failure to open per-directory .gitattributes with error status other than ENOENT and ENOTDIR should be diagnosed, but it wasn't. - * "git log --all-match --grep=A --grep=B" ought to show commits that - mention both A and B, but when these three options are used with - --author or --committer, it showed commits that mention either A or - B (or both) instead. - (merge 39f2e01 jc/maint-log-grep-all-match later to maint). + * When looking for $HOME/.gitconfig etc., it is OK if we cannot read + them because they do not exist, but we did not diagnose existing + files that we cannot read. - * Earlier we made the diffstat summary line that shows the number of - lines added/deleted localizable, but it was found irritating having - to see them in various languages on a list whose discussion language - is English. - (merge 218adaa nd/maint-diffstat-summary later to maint). + * When "git am" is fed an input that has multiple "Content-type: ..." + header, it did not grok charset= attribute correctly. - * "git fetch --all", when passed "--no-tags", did not honor the - "--no-tags" option while fetching from individual remotes (the same - issue existed with "--tags", but combination "--all --tags" makes - much less sense than "--all --no-tags"). - (merge 8556646 dj/fetch-all-tags later to maint). + * "git blame MAKEFILE" run in a history that has "Makefile" but not + "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got + confused on a case insensitive filesystem and failed to do so. - * The subcommand in "git remote" to remove a defined remote was - "rm" and the command did not take a fully-spelled "remove". - (merge e17dba8 nd/maint-remote-remove later to maint). + * Even during a conflicted merge, "git blame $path" always meant to + blame uncommitted changes to the "working tree" version; make it + more useful by showing cleanly merged parts as coming from the other + branch that is being merged. - * After "gitk" showed the contents of a tag, neither "Reread - references" nor "Reload" did not update what is shown as the - contents of it, when the user overwrote the tag with "git tag -f". - - * "git cvsimport" did not thoroughly cleanse tag names that it - inferred from the names of the tags it obtained from CVS, which - caused "git tag" to barf and stop the import in the middle. - - * "git show --format='%ci'" did not give timestamp correctly for - commits created without human readable name on "committer" line. - (merge e27ddb6 jc/maint-ident-missing-human-name later to maint). + * Output from "git branch -v" contains "(no branch)" that could be + localized, but the code to align it along with the names of + branches were counting in bytes, not in display columns. * "git cherry-pick A C B" used to replay changes in A and then B and then C if these three commits had committer timestamps in that order, which is not what the user who said "A C B" naturally expects. - (merge a73e22e mz/cherry-pick-cmdline-order later to maint). - * "git show --quiet" ought to be a synonym for "git show -s", but - wasn't. - (merge f9c75d8 jk/maint-quiet-is-synonym-to-s-in-log later to maint). + * Documentation talked about "first line of commit log" when it meant + the title of the commit. The description was clarified by defining + how the title is decided and rewording the casual mention of "first + line" to "title". + + * "git cvsimport" did not thoroughly cleanse tag names that it + inferred from the names of the tags it obtained from CVS, which + caused "git tag" to barf and stop the import in the middle. + + * Earlier we made the diffstat summary line that shows the number of + lines added/deleted localizable, but it was found irritating having + to see them in various languages on a list whose discussion language + is English. + + * "git fetch --all", when passed "--no-tags", did not honor the + "--no-tags" option while fetching from individual remotes (the same + issue existed with "--tags", but combination "--all --tags" makes + much less sense than "--all --no-tags"). + + * "git fetch" over http had an old workaround for an unlikely server + misconfiguration; it turns out that this hurts debuggability of the + configuration in general, and has been reverted. + (merge 6ac964a sp/maint-http-info-refs-no-retry later to maint). + + * "git fetch" over http advertised that it supports "deflate", which + is much less common, and did not advertise more common "gzip" on + its Accept-Encoding header. + (merge aa90b96 sp/maint-http-enable-gzip later to maint). + + * After "gitk" showed the contents of a tag, neither "Reread + references" nor "Reload" did not update what is shown as the + contents of it, when the user overwrote the tag with "git tag -f". + + * "git log --all-match --grep=A --grep=B" ought to show commits that + mention both A and B, but when these three options are used with + --author or --committer, it showed commits that mention either A or + B (or both) instead. * "git p4", when "--use-client-spec" and "--detect-branches" are used together, misdetected branches. - (merge 21ef5df pw/p4-use-client-spec-branch-detection later to maint). - * Output from "git branch -v" contains "(no branch)" that could be - localized, but the code to align it along with the names of - branches were counting in bytes, not in display columns. - (merge 1452bd6 nd/branch-v-alignment later to maint). + * When you misspell the command name you give to the "exec" action in + the "git rebase -i" insn sheet, you are told that 'rebase' is not a + git subcommand from "git rebase --continue". - * When looking for $HOME/.gitconfig etc., it is OK if we cannot read - them because they do not exist, but we did not diagnose existing - files that we cannot read. + * The subcommand in "git remote" to remove a defined remote was + "rm" and the command did not take a fully-spelled "remove". * The interactive prompt "git send-email" gives was error prone. It asked "What e-mail address do you want to use?" with the address it @@ -219,4 +217,14 @@ tempting the user to say "y". But the response was taken as "No, please use 'y' as the e-mail address instead", which is most certainly not what the user meant. - (merge 6183749 sb/send-email-reconfirm-fix later to maint). + + * "git show --format='%ci'" did not give timestamp correctly for + commits created without human readable name on "committer" line. + + * "git show --quiet" ought to be a synonym for "git show -s", but + wasn't. + + * "git submodule frotz" was not diagnosed as "frotz" being an unknown + subcommand to "git submodule"; the user instead got a complaint + that "git submodule status" was run with an unknown path "frotz". + (merge af9c9f9 rr/maint-submodule-unknown-cmd later to maint).
diff --git a/git-rebase.html b/git-rebase.html index 2db1148..3de9e73 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -587,7 +587,7 @@ [<upstream>] [<branch>] <em>git rebase</em> [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] -<em>git rebase</em> --continue | --skip | --abort</div> +<em>git rebase</em> --continue | --skip | --abort | --edit-todo</div> <div class="verseblock-attribution"> </div></div> </div> @@ -851,6 +851,14 @@ </p> </dd> <dt class="hdlist1"> +--edit-todo +</dt> +<dd> +<p> + Edit the todo list during an interactive rebase. +</p> +</dd> +<dt class="hdlist1"> -m </dt> <dt class="hdlist1"> @@ -1705,7 +1713,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-07-23 21:34:17 PDT +Last updated 2012-09-30 00:37:08 PDT </div> </div> </body>
diff --git a/git-rebase.txt b/git-rebase.txt index fd535b0..da067ec 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -12,7 +12,7 @@ [<upstream>] [<branch>] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] -'git rebase' --continue | --skip | --abort +'git rebase' --continue | --skip | --abort | --edit-todo DESCRIPTION ----------- @@ -245,6 +245,9 @@ --skip:: Restart the rebasing process by skipping the current patch. +--edit-todo:: + Edit the todo list during an interactive rebase. + -m:: --merge:: Use merging strategies to rebase. When the recursive (default) merge
diff --git a/git-submodule.html b/git-submodule.html index 888ce77..bd279d9 100644 --- a/git-submodule.html +++ b/git-submodule.html
@@ -689,7 +689,6 @@ initialized, <tt>+</tt> if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository and <tt>U</tt> if the submodule has merge conflicts. - This command is the default command for <em>git submodule</em>. </p> <div class="paragraph"><p>If <tt>--recursive</tt> is specified, this command will recurse into nested submodules, and show their status as well.</p></div> @@ -975,7 +974,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-09-04 16:16:22 PDT +Last updated 2012-09-30 00:37:08 PDT </div> </div> </body>
diff --git a/git-submodule.txt b/git-submodule.txt index 2de7bf0..b4683bb 100644 --- a/git-submodule.txt +++ b/git-submodule.txt
@@ -112,7 +112,6 @@ initialized, `+` if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository and `U` if the submodule has merge conflicts. - This command is the default command for 'git submodule'. + If `--recursive` is specified, this command will recurse into nested submodules, and show their status as well.
diff --git a/git.txt b/git.txt index 6710cb0..48bd04e 100644 --- a/git.txt +++ b/git.txt
@@ -43,9 +43,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.12.1/git.html[documentation for release 1.7.12.1] +* link:v1.7.12.2/git.html[documentation for release 1.7.12.2] * release notes for + link:RelNotes/1.7.12.2.txt[1.7.12.2], link:RelNotes/1.7.12.1.txt[1.7.12.1], link:RelNotes/1.7.12.txt[1.7.12].
